merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Fri, 30 Nov 2007 15:54:33 +0000 (08:54 -0700)
committerAlex Williamson <alex.williamson@hp.com>
Fri, 30 Nov 2007 15:54:33 +0000 (08:54 -0700)
commite51883064f703213179a6852f7e85d3e33528f3b
tree6b7d6c81ba456eee9b375ab4cbfd90b842bb6244
parent1ea2ab2fe8e4dd9379329c104254ff56ad00f5a7
parent86ca9c3f61b24816532a0cdd8f2bd80af254be15
merge with xen-unstable.hg